From: Kenichi Handa <handa@gnu.org>
Date: Sat, 28 Jun 2014 13:41:19 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~23^2~3423^2~1407
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=7ac67e08e52b7d4c292f17841084f316644ce195;p=emacs.git

merge trunk
---

7ac67e08e52b7d4c292f17841084f316644ce195